fix(server): retain OpenCode V2 per-turn token usage by saphid · Pull Request #9937 · pingdotgg/t3code

saphid · 2026-09-05T05:10:16Z

OpenCode V2 now records per-turn token usage from step-finish events, deduplicating step IDs and carrying input, cache, output and reasoning totals into the turn. Completed turns report complete usage, interrupted/failed turns preserve partial usage, and turns without usage data report unavailable rather than zero. Subagent presence is tracked separately from the main-agent totals.

Current head ea21a4983 includes current V2 base 3aa47e294 and the shared test-only prerequisite #10865. Merge #10865 first; the topic itself changes 2 files. This rebuild removes the obsolete merged-base history from the PR diff.

Validation: 58 focused tests pass across the affected feature and foundation persistence coverage. Scoped server typecheck passes; targeted lint, formatting and diff checks pass. After merging the latest V2 base, 24 OpenCode adapter and targeted queued-cancellation replay tests pass; server typecheck passes. New-head CI is pending.

Independent cross-provider review was unavailable: the direct Claude Opus 5 high launcher in this audit exited 1 with expired OAuth before inference. No Claude review is claimed.

Targets Orchestrator V2 in #2829. Updated with GPT-6 in Codex/T3.

macroscopeapp · 2026-09-05T05:14:12Z

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This focused fix restores per-turn token accounting and changes provider-turn usage data consumed by analytics and potentially metering. The implementation is isolated and tested, but the billing/usage surface warrants human review.

^{You can add or adjust custom eligibility rules. Learn more.}

cursor · 2026-09-06T04:42:21Z

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

saphid · 2026-09-08T04:51:34Z

Independent automated first-pass review (Amp/Astra agent mode) against base 415ed0f: no actionable findings. Verified in source: usage normalization matches the pinned OpenCode v1.15.13 conversion; step-ID dedup handles replay; root/child accumulation stays separate; unavailable/partial shapes satisfy the TurnTokenUsage contract; hasSubagents is only set on task tools; tokens fields are SDK-required and defensively clamped. One note: the PR-side diff vs the current base tip is inflated because the base branch advanced past 415ed0f; the contribution itself remains the two adapter files.

cursor · 2026-09-08T05:58:13Z

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

macroscopeapp · 2026-09-08T05:59:31Z

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

Co-authored-by: codex <codex@users.noreply.github.com>

- Re-route steering that races completion into idempotent follow-up dispatches - Preserve scheduled-task attribution and provider ownership history across clients

Port main's pull-request discovery, active thread ordering, async question dismissal, settlement fixes, provider-session import, attachment context, and provider correctness changes into orchestration v2. Keep the branch's intentional composer and subagent behavior while adopting main's web and mobile fixes. Prevent headless setup terminals from hanging on the color probe, and move the v2 migration block to 050-061 after main claimed 048-049.

Restore the failed-before-start timer guard, align two server fixtures with the reconciled behavior, and remove dead files, exports, and dependencies surfaced by Knip. Drop the temporary branch push trigger now that the PR is mergeable, so each update runs the pull-request workflow once.

Keep main's batch machine-update banner and update action while preserving the v2 runtime-based environment lock used by draft load balancing.

Adopt TypeScript 7 and Effect rc.112 across orchestration v2, including the TaggedError API migration and updated Effect-aware tests. Restore main's composer-aware scroll-to-end clearance while retaining selected-model settings sync, preview recording transfer, image galleries, desktop context menus, and layout hit targets. Regenerate the lockfile on the upgraded dependency baseline.

Advertise bounded socket snapshots and authoritative dispatch validation, omit raw command output and inline file bodies at the wire boundary, and preserve compact status metadata across web and mobile. Add transport-budget coverage for snapshots, resume, commands, legacy import, and projection maintenance.

Restore pinned-thread shelf classification, server-owned unread state, hidden-subagent-safe project ordering, guarded jump hints, draft upload cleanup, and active-provider archive guards across the current and legacy sidebars. Bring the surrounding current-main sidebar work forward as well: canonical project favicons, stable row layout, thread file drops, account-aware mobile provider badges, and deferred desktop keyring loading.

juliusmarminge · 2026-09-10T23:21:16Z

Closing as superseded by 95045bb, already on remote v2. The adapter retains normalized per-turn OpenCode step-finish usage, deduplicates step IDs, reports main-agent scope and subagent presence, and distinguishes complete/partial/unavailable totals. Current code additionally checks message ownership to avoid charging unrelated/replayed steps to a turn. All five focused usage cases pass on current v2.

github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Sep 5, 2026

juliusmarminge force-pushed the t3code/codex-turn-mapping branch 2 times, most recently from 9242b91 to 3d81172 Compare September 8, 2026 03:31

github-actions Bot added size:XXL 1,000+ changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Sep 8, 2026

juliusmarminge and others added 19 commits September 7, 2026 23:12

fix(mobile): allow archiving post-provider work

e0f89c5

Co-authored-by: codex <codex@users.noreply.github.com>

fix(mobile): distinguish queued and waiting archive states

2e776a8

Co-authored-by: codex <codex@users.noreply.github.com>

fix(cursor): log close attempts before execution

e6d5c09

Co-authored-by: codex <codex@users.noreply.github.com>

fix(acp): discover final teardown descendants

b13443d

Co-authored-by: codex <codex@users.noreply.github.com>

fix(checkpoints): preserve valid run history

03d044b

Co-authored-by: codex <codex@users.noreply.github.com>

fix(orchestration): preserve imported conversation state

3c658ad

Co-authored-by: codex <codex@users.noreply.github.com>

fix(acp): enforce task and permission invariants

c252769

Co-authored-by: codex <codex@users.noreply.github.com>

fix(testkit): harden provider replay recording

5941af5

Co-authored-by: codex <codex@users.noreply.github.com>

fix(server): isolate deterministic attachment ids

3d4a365

Co-authored-by: codex <codex@users.noreply.github.com>

fix(claude): preserve explicit model options

e596525

Co-authored-by: codex <codex@users.noreply.github.com>

fix(web): enforce secure provider field defaults

eb63d51

Co-authored-by: codex <codex@users.noreply.github.com>

fix(client): preserve live thread relationships

3cbe7fb

Co-authored-by: codex <codex@users.noreply.github.com>

fix(checkpoints): retain thread-start baseline after failed runs

12fbe64

Co-authored-by: codex <codex@users.noreply.github.com>

fix(mobile): gate thread controls on live runs

4ce4c48

Co-authored-by: codex <codex@users.noreply.github.com>

fix(orchestrator): address late review findings

452d3d5

Co-authored-by: codex <codex@users.noreply.github.com>

fix(orchestrator): handle fresh review edge cases

7709348

Co-authored-by: codex <codex@users.noreply.github.com>

fix(orchestrator): harden provider edge cases

8dc3ad5

Co-authored-by: codex <codex@users.noreply.github.com>

fix(orchestrator): execute resolved runtime responses

0f87bec

Co-authored-by: codex <codex@users.noreply.github.com>

fix(orchestrator): release stranded effect claims

b54f3f8

Co-authored-by: codex <codex@users.noreply.github.com>

juliusmarminge added 14 commits September 7, 2026 23:12

feat(mcp): expose selected environment preferences (pingdotgg#10560)

d5f853a

feat(mcp): expose the existing thread search query (pingdotgg#10561)

90335b9

feat(mcp): expose scheduled task run-now (pingdotgg#10562)

e060fec

feat(mcp): expose project service operations (pingdotgg#10563)

e64c1bb

feat(mcp): expose attachment upload and send (pingdotgg#10564)

892c468

feat(mcp): expose project thread launch service (pingdotgg#10565)

cc2a95e

feat(mcp): expose branch-backed workspace discovery (pingdotgg#10566)

054a37d

fix(orchestration): map late steering to follow-up turns

a6bbe8b

- Re-route steering that races completion into idempotent follow-up dispatches - Preserve scheduled-task attribution and provider ownership history across clients

chore: remove accidentally committed audit artifacts

5b42579

fix(web): port auto-balance updates to v2 chat

8ca7ee3

Keep main's batch machine-update banner and update action while preserving the v2 runtime-based environment lock used by draft load balancing.

chore: format files exposed by CI

2460494

juliusmarminge force-pushed the t3code/codex-turn-mapping branch from efd9994 to 6102d00 Compare September 8, 2026 06:23

juliusmarminge and others added 6 commits September 8, 2026 14:26

fix(web): restore compact load-earlier control

91b1936

fix(web): preserve tool failures after output redaction

7dd9873

fix(server): account for OpenCode turn usage

ef63e9d

test(server): match V2 tool output redaction in retention coverage

2088c00

Merge commit '2088c001d' into HEAD

648221e

saphid force-pushed the fix/v2-opencode-usage-20260905 branch from caac367 to 648221e Compare September 9, 2026 00:18

github-actions Bot added size:M 30-99 changed lines (additions + deletions). and removed size:XXL 1,000+ changed lines (additions + deletions). labels Sep 9, 2026

juliusmarminge and others added 2 commits September 8, 2026 17:26

Merge commit '3aa47e294fbb7b7cc33b0fb6cd7c19bb4985ff52' into HEAD

ea21a49

juliusmarminge force-pushed the t3code/codex-turn-mapping branch 2 times, most recently from ed5dc41 to 2b1139a Compare September 10, 2026 19:28

juliusmarminge closed this Sep 10, 2026

Navigation Menu

Uh oh!

fix(server): retain OpenCode V2 per-turn token usage - #9937

fix(server): retain OpenCode V2 per-turn token usage#9937
saphid wants to merge 387 commits into
pingdotgg:t3code/codex-turn-mappingfrom
saphid:fix/v2-opencode-usage-20260905

saphid commented Sep 5, 2026 •

edited

Loading

Uh oh!

macroscopeapp Bot commented Sep 5, 2026 •

edited

Loading

Uh oh!

cursor Bot commented Sep 6, 2026

Uh oh!

saphid commented Sep 8, 2026

Uh oh!

cursor Bot commented Sep 8, 2026

Uh oh!

macroscopeapp Bot commented Sep 8, 2026 •

edited

Loading

Uh oh!

juliusmarminge commented Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

saphid commented Sep 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

macroscopeapp Bot commented Sep 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Approvability

Uh oh!

cursor Bot commented Sep 6, 2026

Bugbot is paused — on-demand spend limit reached

Uh oh!

saphid commented Sep 8, 2026

Uh oh!

cursor Bot commented Sep 8, 2026

Bugbot is paused — on-demand spend limit reached

Uh oh!

macroscopeapp Bot commented Sep 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

juliusmarminge commented Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

saphid commented Sep 5, 2026 •

edited

Loading

macroscopeapp Bot commented Sep 5, 2026 •

edited

Loading

macroscopeapp Bot commented Sep 8, 2026 •

edited

Loading